refactor API, alter default output