fixed codeclimate issues