Cleaned up Simplifier