[~TASK] Refactoring / Optimization of method to clear fields