Getting rid of class variables