Small cleanup to fill inside