just the small changes, due the review of @swissmanu. thx btw.