:+1: for extracting the implementation of the check to a standalone module.

Having said that, I don't mind doing such change later in another PR and in a different sprint.