Valueform refactoring