right a fixed size should be used here
I don't see what would need refactoring? changing the types should be enough?