separate expression module, more code