slight refactor
fix deps
release 4.0.0