Fixed if/else statements.