Refactor code into "classes".
Cleanup.