Refactored documentation

Code review for documentation