Adjustments based on code review and RuboCop