More code cleanup and documentation
Bump version