system-filter template formatting cleanup + comments

Change-Id: I27587c9590acf5da89ba74884ff05d5406e734d7