WhiteSpace Clean up