Minor code clean-up and comment/README clarifications