More vars, removed unused method