Refactoring and improving code base.