Refactor random drawing of skills