Changed some variables, deleted some superfluous figures