Minor tidy up, moved stuff to config