REFACTORING: minor code simplification