Made passing of return value more regular