cleaning up codebase