minor formatting and comments