Made return statements more explicit.