Run Rubocop
run rubocop
More rubocop and fixing errors
Merge branch 'mjboyarov-develop'