Remove debug, style fixes.