MAJOR *formatting* cleanup