Some refactoring

Sorry I'm a change management maniac