Further reformatting Changes