Refactored code base.