Code Style Improvements