Code refactory to Guayana