Some syntactical clean-up of awsDataModel.js