Code base refactored