Made some variable names a bit cleaner