Refactor painting of players out of pokebooze

Also some sensible variable renamings