Decouple shapes from rendering code