Refactoring

where to start?

Refactoring

contents