Improve JS case