CS Fixes

I don't like newlines before return statements when the return statement is not at the end of the method (e.g., here it's in a conditional).