Refactored codebase.