minor cleanup and fix
(#554)