Minor minor cleanup