rubocopification and minor stylistic refactoring