Move helper into different files