Reformatted the latest changes.