Constants extraction
Merge branch 'master' of github.com:kdridi/intra
refactoring