refactor, remove deps
0.1.1