Cleaned up costbylocation