Whitespace-cleanup