minor cleaning
another barnacle: catch misused else errors earlier