#5 Applied cgcostumes comments and further cleanups.