Bring code base closer to thoughtbot style