Minor CS Stuff

It might make more sense if after we've finished this still, I'll make a pull to add them over the entire project.