More variable cleanup.
Merge branch 'master' of https://github.com/shaabanban/ECE313-Final