minor comment and code organization changes