Refactoring effects a bit.