Simplify more code