Small modifications and cleanups