minor simplification attempt