Style Improvements
Style improvements