Did some more tidying up
moved stuff into config file.