Updated docs and Code Review