refactor fixed grammar and code readability