wtf?
Cleanup, rewriting