Nicer syntax

Cleaning up the codebase, fixed some minor issues and added rubocop.