minor cleanup again