Improve documentation
Update commented code