Cleaned up some CCpeople code