Correct pre-shifted multiplier check
Refactor