ticket:5 Made refactoring