Clean up, formatting - no code change