Updates variable names
Merge pull request #6 from markableidinger/clean_code

Updates variable names
Merge branch 'master' into working
Merge pull request #7 from markableidinger/working

Trying to make these branches work