Move return clause for clarity