Small cleanups to keep the files small