(+) Some Optimizations, simplifications