pokemon updated

with refactor