Doc and some code simplification
Doc simplification