refactors a few variables
Merge branch 'view-all-keys' of github.com:phoenix-scitent/okm into view-all-keys