You need to follow the 4 directional grid of the terrain. You'll notice if you go at angles, it makes it messy. If you make a square, it will have all flat edges.

Squares don't look that good, so you'll have to balance between that and whatever shape you want.