Another small cleanup