Rename variables
Rearrange special characters

[Close #1]