fixed issues based on review comment