Formatting changes

Made some formatting changes, removed unnecessary comments, fixed some
spelling, and did a bit of code cleanup.