Cleaned up variables

Variables now actually have some context in their naming.