Updated docs and clean up