Removed unnecessary nesting of containers