Happy Path 5.3.1 section, fix rubocop errors