Rubocop fix

Updated files to pass Rubocop tests