Tidy config files and retaining blank lines