Made return statement a component