Cleanup config fragments so the final file has more readable format