#195 small cleanup