Clean up consequitive return clause