A pinch of succinctness sprinkled :-)
Merge pull request #6 from viktorklang/master

Some minor touchups