cleaned up variables