Minor changes + comments added
Remove useless file