CGL Cleanup and Code Cleanup