extended appData (js) object
General cleanup
formatting