Remove redundant steps
Simplify the content and move to a triangle format