minor code clean up, removing extraneous console messages, etc.