mostly code formatting cleanup, and also object disposal fix