moved if/else statements to 1 line