refactoring and code style fix
Merge remote-tracking branch 'origin/master'