Add location and delete whitespace