Clean solution

:D