Rename variable and remove braces