Make it better

all changes were discussed