Cleanup and whitespace