Cleanup line wrapping, commented out lines, etc.