DROIDS REPL: Refactor