Cleaning up syntax and variable names