fixed mapping of constructor args if order of fields is not the same
removed unnecessary comment