Fix/Organize Code

[WgocowboyS]

Problem:
Code is currently not organized, and can be given better more distinct names.
Solution:
Go through code and rename variables and organize to be more visually succint.