merge js / and refact wolf js