Merge pull request #1 from Elyotna/master

Sync
Reformatting & changed variables for clarity
Removed todo
Merge pull request #34 from SpiritedDusty/master

Lua reformatting & changed variable name for clairty