Cleaned up CWConstants