moved more string keys into constants