Refactoring

So function description