refactor duplicate values into proper constants
Merge branch 'master' of github.com:ruiquelhas/sdnv