Address Joe's review comments