Refactoring towards more simplicity.