minor repl reorganization