finished refactoring skills