killed ifs and elses when other constructs were more appropriate

Hey there from JS chat ;) Too lazy to fix the pluralization - I know, I know, I shouldn't complain if I don't want to fix it myself, all that :P I did see some ifs and elses that should have been other things, so I changed them