Push class loader
Clean up classes and write comments