codeclimate fixes