The prequeisite Gia related code beautification pull