Move helper func sections to be inline