cleaned up codebase
cleaned up codebase