Cleaned up expression code