Cleanup and simplify, add to README