Some variable clean ups.