Use autoloader.
Code cleanup.