Fix whitespace around tags