CMS-3501 Simplify data value classes. Cleaned up some code.