minor
clean-up & comments