cleaned codebase