refactoring

2 articles