Remove index for Edge & Corner, simplify improveCorners method