refactored partially satisfy rubocop

testing remote build DO NOT MERGE