Coding Style Improvements.