Cleanup and document
More cleanup
Update readme