refactorying dataclause handler