Remove useless code. Change order in if statements. if else if -> switch
Update AUTHORS
Get rid of strcmp
Cosmetic changes