Minor refactor to cleanup code
Merge branch 'master' of github.com:bazwilliams/alphacards