More cleanups, address review