Simplifying Codebase