Minor changes + comments