use better constructor
remove useless arg in contructor
fix datamap members