fewer magic strings/drier code