Some refine master branch