Swdanielli/code clean