Code Structure Formatting Done

All code review comments are implemented and documents are updated.