Refactor + remove assertions that don't really ever get used
Update readme
Version v2.0.0