Rubocop

@sferik I will squash all of these commits, once this PR is approved. Is it okay if I rebase onto master rather than merging?