Removed some modulus operators, where appropriate.