Removed Classloader and Compiler cruft
PSR-2 compliance