Code review: cleanups, cleanups