replaced one-line if's with postfix if's (refactor)