Re-commented a lot of code to make it more clear.
Cleaned up variables that didn't conform to others.