Clean up white spaces