Splitting build method into multiple funcs