Cleanup - comment format, leaks, etc.