minor constants improvements
refactoring
refactoring + small fixes