Extracts methods :gift_heart:

* Refactor
* Less workspace usage
* Reduces OutOfMemory errors