beef up comments; restructure close/cleanup methods