Fix remarks from @dbuenzli @bendiken and @mor1

Thanks!!!