Improve js