Remove empty if statements
Fixed constant names
operator order