finish 3 skill refactor