some rubocop and conditional cleanup