refactored and removed unused constants
Merge branch 'master' of https://github.com/ukwa/shine.git