Refactors DataStandard to read better