Got rid of member vars