Update SExp rendering and cleanup code