Changes to make best practices