DRY: style in one place, removed code duplication