Trailing whitespace
Improved tags