Constants added, refactoring