more cleanup and comments #18