Respond to review comments (PR 33)