Fix documentation part3
Optimize stuff