Constans fix && code clean