Updated cleaned up variables