Further RN edits per review comments
Even more RN edits per reviews