Refactor.
First commit.