Cleanup JS a little