Use the return statement to reflect the new style and best-practices