Got rid of sloppy variable redundancy