Changed many explicit refences to 'ArrayList' to just 'List'