Modiications after PR review. Thanks @dotta !