Cleaned up Loader class