Fix style issues

Also add rubocop as a dependency