Revert "Some refactoring made"

This reverts commit bd2f3c525256a8890fa17f2bf05963766ec7172c.