Added comments and updated index view