Re: advice on minor cleanups?