Organizing variables
Removing braces