Deleted redundant func
Deleted default value setting
Fixed list index
refs #620