Small style changes, remove debugging printout