Tidy up main config