Reformatted and cleaned up