Refactor: removed yield methods and added yield as option
Refactor: extracted functions