Cleaned some code. Refactored a few variables to something more
meaningful.