Cleaned up CWContainer