JS wrap, better comments