fixing some spaces + use classes themselves for up/downstream invalidations