load.cass refactor, tidy up