Refactoring
Consts refactoring
Const refactoring
Remove unused deps from pom.xml