Simplify
More cleanup