Simplify more
Address comment issues