Better structure in Simplify, some more functions