~ simplify code