Lots of minor changes
Minor formatting changes
Edits based on MK's comments