With these rubocop changes, I've tried to avoid breaking up methods, etc as it causes problems in terms of code breakages and git conflicts. I've opened an issue for it though because I do think it's a good idea and also, I've seen it a plethora of places throughout the code/