Revert "Refactor for cleanliness."

This reverts commit a879587cade0450a0c46d036e719db1f40899541.