Tidy up: Removing short tags and indenting/bracketing