Slight stylistical fixes wanted by @chaseoes, related to #22