refactor statement.lisp