Tidy up of Loader to remove dependancy of Log class and Constant