renamed calculable interface to expression