Style enhancements and minor fixes