Small reformat to Skill class