Made declaration of return type more regular