Implement a few code analysis suggestions