change return statements from  to