Removed unnecessary comments.
General formatting clean-up.