Preliminary code cleanup based on latest Rubocop