Cleanup code
Update documentation