Some enhancements on style and structure