Cleaned up Loader.