Minor refactoring to remove unnecessary 'return'