No magic numbers
Add todo about a refactoring need