More style fixes
Properly use Drawing.Rectangle in domain calculation