Include feedbacks from benj code review