minor cleanup/modernization