Modifications after PR review. Thanks @dotta !