Style fixes based on RuboCop advice