Fixing short tags

Resubmitted to remove the } edits, also the spacing is neater now.