Minor refactor. Updated REPL.