CS fixes (braces)