Work on js optimization