Minor changes + comments added