Code Style and Enhancements