cleaning up usaw js a bit