Code cleanup, had senior moment on error handling.  Also, get rid of gross comment cruft