Further simplify the JS