explicit variable names
Shorted comparison, longer exit message.
Merge pull request #2 from sgs00/master

Other minor changes