Indentation and EDoc changes
Indentation and small changes
EDoc changes and code simplification
API comment moved