Clean up variable names and braces