More work on the code simplification (prelude2)