Fix spacing and the notations of variables
Merge branch 'Refine'