mostly whitespace cleanups
bye bye multivalent