refactor Datahandler class