Code clean up: remove 'and' and 'or' from logic.

Should use && and || instead.