Minor improvement in doc and comments