Added more usecases and cleaned them up