fix lvl 1 and cleanupcode