CS Fixes

Just a few cs fixes here. I've also ordered the use statements alphabitically.