Zee refactors everything