readme update & some code cleaning