Refactored code and changes in documentations.
Paragraph 5.1 finished