Cleanup of README and TODO