[TASK] Code cosmetics