Revert "Started potential refactoring"

This reverts commit 0d2b809c72d9702dea0c8ead2d1bbe6ac049b864.