Some clean up and refactoring.
Add Code Climate badge