CS fixes
More CS fixes / Reformat