Amend codeing style