standardize and simplify code and enhance display