Further reformatting