Following best practices

//Following best practices