RMSE and MAE re-factored