Clean Up
Converted use case steps into inidividual entities