Simple cleanups

Preparation ahead of future commits.