Minor cleanup, working on the asm code (untested)