Refactor some.
Fixing.