[TASK] Code cleaning.