minor updates
clean up from static analysis