Revert "Small refactor;"

This reverts commit 203088f66de10643ed114e41f1a0a257a0187a2e.