reformattign and cleaning up