Improve JS