Force uint
Refactor!