Refactoring & consolidating.