Lots of refactoring. Simplicity is the king