Refactor general

:D