Minor changes + removed unused method