Refactor commit.

Intendation of common.rb was messy, fixed that. Also the same file
has a duplicate in lib folder, removed it too.