Clean/statements

/cc @ianstormtaylor @MatthewMueller this works off of https://github.com/duojs/duo/pull/299 to simplify the way the conditionals are a bit so it's easier to follow :)