Changed function returns to make use of Go return variables.

Changed function returns to make use of Go return variables. #27