Swtich to a more standard callback(err, result) syntax