Worked on best practices