Refacto + fixes