Minor Style Improvements