Cleaning up some goofs and rubocop auto-correct noise