best practices fixes

just made some fixes for best practices.