Followed advises from golint