Cleaned up CModule