Change return pattern to be more friendly.