+ small cleanup