improved performance by removing container element