Reformatting for consistency