Was added links and code refactoring