minor cleanup & a fix