Address review comments from DB and Cale