removed superfluous lines in patch.
fixed white space issues.