Cleanup
Major cleanup of constant.*pp