Code cleanup, HiddenValue