Refactoring of codebase.