Some rubocop changes (WIP)