rework codebase