A little cleanup, remove debugging printf's