s4-dfs: clean the code