Refactored cg-init macro to streamline naming and improve git step order