minor cleanup
Merge #127
minor cleanup of #127