refactoring, constants names, fixed trello notes