Removed whitespace and deprecated _map workaround