simplify code
clean up api
fix setup