Address Joshs PR feedback