Improve integer conditions