Comments style enhancements
Fix #9