WIP - Some refactorings.