Remove debugging tools; style code