Tons of refactoring, no added features