simplify and annotate loaders based on review feedback