minor commenting and formatting