One-line if-else
Fixed too long lines