implementing more best practices