* - Draft of implementation of refactoring

- compilation fix

* - Fixes after review

* - Removed unnecessary comment