General whitespace and indent cleanup, removed trailing whitespace and constrained code to 80 cols