Some typo fixes, some style fixes (RuboCop) and also some refractor (Rubocop)
Merge branch 'feature/add_user_resource'