Code Styling Improvement.