Address review comments related to body events