Revised using boolean

Shorter! Cleaner! Woot!