ran rubocop, modified all required files to fix errors