Refactored, streamlining code
Corrections to initialition of list functions