#250 Fixing Variables to be more descriptive