advice on minor cleanups?