Adding indent helpers and cleaning up some includes