clean up Data by extracting methods