First set of changes, fixing rubocop citations