Apply minor cleanups