tiny cleanups before more prototyping