More suggestions added from review's comments