Revert "Refactor."

This reverts commit 15a6eed986ef87e82965ac51922e1a62d6a8e946.