Code clean up

Cleaning up variables