GH-21 comparison check fail for short & empty string. Fixed other small issues - typos, namings.