Clean code
Update documentation