Refactorering into one function
Even better refactorering
Update installation documentation
Remove some comments