[Refactoring] rubocop code styles, better structure, minor improvements
[Refactoring] spec for update_values, minor fixes