Restructured the whole article