Add basic collection indent using zippers
Refactor order of indent functions