[IMP]: improve code and typo based on review