Merge pull request #64 from DrMarcII/master

More minor cleanup.