tidy up main and config files