Simplify valid_formula_location? method
Convert update report to use composition