Fix whitespace and \t
Remove mapper