Some additional minor cleanup.