Autoloader added
Switch to underscore style