Small cleanups in interact class