Did some cleaning up and updated the docs