Reformatted cleanup