Cleaned up Container class