refactoring. added 'final' modificator to None.
Merge remote-tracking branch 'origin/master'