Clean up codeclimate issues