Activity 4 - Code simplification and adjustements

Class:
RegisterServiceType
SearchDoneService