Minor changes in docs and some cleaning