Refactored and commented dataElementService