Refactor skill building