Cleanned up the assembler module (not-tested).