Clean up some pundit code
Merge pull request #2 from bmneely/some-pundit-cleanup

Clean up some pundit code