Cleaned up module, container