Cleaning up top level loader a bit