small refactoring
CleanUp
follow up