Update documentation
Refactor
Simplify
More documentation updates