Remove the useless DFS and EXP-TREE from Giri

Also refine some coding styles.