Clean up expression code