constatns, cleaning, refactoring
name rafactoring