Commenting; changed some Lists to Iterables