Cleaned up CFG-GP init methods