Next step: refactoring.