Some formatting and removing comments.