new code style, switch deps