refactored: add _ to private variables
Merge remote-tracking branch 'origin/master' into yongkai