Little bit of a cleanup of autoload