Rubocop changes

Still needs to be rewritten and have docs added