CS fixes

Hmm really dislike this. Just keep assignment on a separate line for readability in my opinion.