Cleaned up some of the variables