less hardcoded strings and bits of fluff