Remove print_r and update with return