* Basic refactoring
* Fixed all failing Rubocop Validations