[FIX]: fix issue and some improvements based on the review