cleaned usecases a little.