Refactoring

2017