[Frontend] - Refactoritzacions varies