Remove debug, clean up slightly