removing magic strings
refactoring code
Merge branch 'UI'