Cleanup; whitespace