Some style changes proposed by @jpetazzo on GH-4 :-)