Refactor rkt