Minor code style improvements as per rubocop rules