Code refactoring. Improved high level methods