Minor cleanups and TODO comments about initialization