more cleanups/commenting