Cleaned up some variables