autoloader performance, tidy up