Landscaping

Addressing code smells detected by https://landscape.io/github/johnsyweb/peg_jump