More clarifications and cleanups