Remove questions from me and updated comments