Cleaning up
Changed expression-type for a general solution