whitespace cleanup

I like 80 chars, do you?