Refactoring

2 Topics