Ok, doing it in another PR is fine. Another small improvement that can be done in next PR is to make this numbers module constants.