Some variable clean up