Address outstanding comments from PR/47 and other cleanups.
Merge pull request #62 from prometheus/julius-cleanups

Address outstanding comments from PR/47 and other cleanups.