Variable commentary and code cleanup

Cleaning and variable commentary for more readable code