simple formatting on all objects and a slight clean up of printlns and other debugging stuff