Small refactoring in Pokemon class
Fixes #1 #2