Made output check a bit simpler