being to clean up codebase