refactoring

2 Topics