Small cleanup to prepare for future work