Simpyfy the API
More tests, coverage > 90%