Fixups/cleanups based on comments