last pass through cleanup, added additional comments