Prettying up the vars and cleaning up