cleanup class variable use