Cleaned up creation of container 1 and 2