cleaned up codebase