Some minor changes

Considering the second chosen use case which we will include on friday.