minor comment/cleanup changes