codeclimate cleanups