Cleaned up code and Added Avg when home or away