Revert "Revert back the commenting style"

This reverts commit c4c1ffd6269fdf4dd86e4700acdf099f4d2318c4.