Converting to defines and else ifs

Defines save flash and progmem and elseifs increase execution speed on code repeated on every loop.

Side note, something funky happened with the spacing.  Fixed it, but it's slightly different than what it was before.