Some formatting/comment cleanup.