Refactoring and tidy up of DB Access, Datamodel etc. prior to introduction of data load via JSON