some minor cleanups to existing logic and behavior

No behavior changes - just cleaning some things up.
Merge pull request #10 from redding/kr-cleanups

some minor cleanups to existing logic and behavior