Fixed up return statement for recursive function and removed remenants of previous style for recursion.