Adding comments, renaming struct per fmtpolice