Cleaning up variables

Cleaned up variable code a bit