More rubocopping.
Merge pull request #211 from nstielau/even_more_style

More rubocopping.