cleaning codebase