[TASK] Code cleaning