Some changes for a cleanup.