simplify shapes for speed gains