Cleaned up variables so as to not polute the shell