Updating to address feedback, still need to resolve statement form of arrow functions