Revert "Refactored"

This reverts commit 378d6d05317ce92ee413be91e9eb97676d02214f.