nicer formatting and removed old debug printouts