Clean solution + add Park