Refactor of codebase.