General cleanup and functionality additions for dataTYPES variables.
Further code cleanup with focus on dataTYPES variable usage.