Tidy up commercial component loader