Fixed more best practices, and explicit/implicit style guide issues.