#125 minor cleanup