Minor comments/formatting changed