simplify codebase