Rewording and removed unneeded variables