refactoring and code to bring the Google JavaScript Style
Merge remote-tracking branch 'origin/master'