refactor toxiclibs