Code Climate
Ruby style cleanup and refactoring
More cleanup
Version
Merge branch 'refactoring'