Small code and doc clean