(Cleanup) - factor out a return statement