Updated docs and simplified