Removed commented code
Modified index name to keep consistency.
Modified plot section to deal with list implementation.