Update README and clean up handler core