little cleanup/style changes reflecting plugin updates