Use default PHP autoloader for classes
Formatting imporovements and remove variables where possible