Improved constant folding
Clean up