Reorganized for doc readability
Improved docs