Rubocop changes only

Still needs to be refactored and have docs added