Added some fixes for codeclimate.
Removed some issues.