Continued clean-up as per issue #20