no line breaks
fewer line breaks
tidied up datajs