Cleaning and ordering code
Documentation update
Docummentation