Minor refactoring
Minor refactoring

elflang/elf,shawwn/lumen,laarc/lumen,laarc/lumen,sctb/lumen,elflang/elf,laarc/lumen-contrib,sctb/lumen,shawwn/lumen,laarc/lumen,elflang/elf,laarc/lumen-contrib,laarc/lumen-contrib,shawwn/lumen,shawwn/lumen,sctb/lumen