Speeding up + changing var names