Fixes for codeclimate