Further little comments and cleanups