Feature/improve js