Code clean-up, mainly indentations, spacing, and erroneous tags.