[TASK] Add line breaks to respect conventions