#102 minor cleanup