Cleaned up excessive IEnumerable buffering
Removed extra ToArray call