Remove completed TODO note
Split methods for lower complexitx

Next is deduplication between extension and header visitors