string keys
minor refactor