Some serious refactoring business going on