Cleanup & bug fix in data mapping