Update documentation
Refactor, cleanup