Refactoring

2018