small refactoring
Merge pull request #1 from HXLStandard/refactoring

Small refactoring