Fixed most major rubocop warnings
Merge branch 'develop'