Clean up and document Loaders