[Pokemon] Tidied up a little bit.