Removing print_r