Refactored Edge
Refactored Corner