A little style fix and refactoring
Merge branch 'master' of https://github.com/BluZeMen/wmf-test