Minor code clean-up and comment/README clarifications
Minor code clean-up and comment/README clarifications