Several refactors.

... Why?