light refactor of global vars to full caps