Follow-up izlude refactor (whitespace changes)