Whitespace cleanup, consistent comparision style,
break lines at 80 characters.