codeclimate reformatting and cleanup