Removed trailing whitespace
Renamed some internal tags.