Added mapping to remove trailing whitespace