Remove some duplication
Merge branch 'master' of github.com:flack/openpsa